Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 28 May 2010 00:48:45 +0000 (00:48 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 28 May 2010 00:48:45 +0000 (00:48 +0000)
commit2e094e8256010163f76d8b61a57007620bf8fc68
tree981d8c598a7bb5e266b3d287cd5df1a4cf01fe02
parent6264f319d25cf6ddd353b835d717f3b4c86398a7
parent6ee4ca2f89b2ecd1d2a9dfb31e138182b7ffabc8
Merge from mainline.